From: Jason Rumney <jasonr@gnu.org>
Date: Thu, 1 Jan 2004 22:51:02 +0000 (+0000)
Subject: (w32_text_out): Use s->font, for consistency with callers.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~24607
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=065cfa2c4966de4bd74d8fd5209e18e646e5b1ad;p=emacs.git

(w32_text_out): Use s->font, for consistency with callers.
---

diff --git a/src/w32term.c b/src/w32term.c
index d7248499c22..ac4e998fed9 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1121,9 +1121,9 @@ w32_text_out (s, x, y,chars,nchars)
      wchar_t * chars;
      int nchars;
 {
-  int charset_dim = w32_font_is_double_byte (s->gc->font) ? 2 : 1;
-  if (s->gc->font->bdf)
-    w32_BDF_TextOut (s->gc->font->bdf, s->hdc,
+  int charset_dim = w32_font_is_double_byte (s->font) ? 2 : 1;
+  if (s->font->bdf)
+    w32_BDF_TextOut (s->font->bdf, s->hdc,
                      x, y, (char *) chars, charset_dim,
                      nchars * charset_dim, 0);
   else if (s->first_glyph->font_type == UNICODE_FONT)